Skip to content

Fix 91 #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
Nov 9, 2025
Merged

Fix 91 #306

merged 13 commits into from
Nov 9, 2025
+468 −68

Conversation

@supersaiyansubtlety
Copy link
Member

@supersaiyansubtlety supersaiyansubtlety commented Sep 26, 2025

fixes #91

repurposed from my fix for #274 that was plagued by AnalyzerExceptions when used by QMap

this:

  • exposes Enigma's lib index
  • adds and exposes a combined index containing both lib and main jar entries to Enigma
  • passes the combined index to EntryRemapper instead of the main jar index
  • disallows renaming entries that trace back to libs (effects Interface implementers with external method implementations prevent naming in GUI #274, but only for the limited number of lib classes currently indexed)
  • removes java/lang/Object's explicit exclusion from InheritanceIndex (added in this commit)

Also adds but does not use JavaClassProvider which can be swapped for ClasspathClassProvider to fix more of #274 once AnalyzerExceptions are sorted.

When squash-merging, be sure to change the commit message about fixing #274 so it doesn't get prematurely closed.

@supersaiyansubtlety
OUT OF MEMORY when trying to run all tests
5375302 
add JavaClassProvider which provied java.* classes
add CombinedJarIndex which indexes main jar and libraries
added missing translation for "progress.jar.indexing.libraries"
@supersaiyansubtlety
make methods that trace back to non-jar methods non-renamable
0aaab89
@supersaiyansubtlety
checkstyle
fc555c3
@supersaiyansubtlety
filter out unreferenced classNames for LibrariesJarIndex and Combined…
ca78792 
…JarIndex
@supersaiyansubtlety
add ReferenceIndex::getFieldsReferencedBy
ac2eda2 
keep lib classes whose fields or methods are referenced in the main jar
@supersaiyansubtlety
exclude java/io/PrintStream from JavaClassProvider
ff25b77 
check if method is indexed in EnigmaProject::isLibraryMethodOverride
@supersaiyansubtlety
update asm (AnalyzerExceptions persist)
6d338d5
@supersaiyansubtlety
use ClasspathClassProvider instead of JavaClassProvider to avoid Anal…
bdc2f8e 
…yzerExceptions; BREAK QuiltMC#274
@supersaiyansubtlety
stop excluding Object from InheritanceIndex and update tests; fix Qui…
6194b10 
…ltMC#91
@supersaiyansubtlety
update TODO
ec7edc3
@supersaiyansubtlety supersaiyansubtlety self-assigned this Sep 26, 2025
@supersaiyansubtlety supersaiyansubtlety added bug Something isn't working backend affects the enigma backend labels Sep 26, 2025
@supersaiyansubtlety supersaiyansubtlety linked an issue Oct 5, 2025 that may be closed by this pull request
[bug] enigma does not consider that classes all override java/lang/Object #91
Open
@ix0rai ix0rai self-requested a review October 26, 2025 17:51
@ix0rai ix0rai moved this to Ready in enigma 2.7 Nov 4, 2025
@ix0rai ix0rai added this to enigma 2.7 Nov 4, 2025
@ix0rai ix0rai moved this from Ready to In review in enigma 2.7 Nov 4, 2025
@supersaiyansubtlety supersaiyansubtlety mentioned this pull request Nov 9, 2025
Draft
8 tasks
ix0rai
ix0rai approved these changes Nov 9, 2025
View reviewed changes
@ix0rai ix0rai merged commit 42ddbd9 into QuiltMC:develop/2.7 Nov 9, 2025
2 checks passed
@github-project-automation github-project-automation bot moved this from In review to Done in enigma 2.7 Nov 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ix0rai ix0rai ix0rai approved these changes

Assignees

@supersaiyansubtlety supersaiyansubtlety

Labels

backend affects the enigma backend bug Something isn't working

Projects

enigma 2.7
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[bug] enigma does not consider that classes all override java/lang/Object

2 participants

@supersaiyansubtlety @ix0rai